Rename debug settings to org.gtk.Settings.Debug4

This gives us the freedom to make changes without
interfering with GTK3.

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index fdead34439519de673643390f06f81760a8ef668..6b6e9148ca2eb545cb9a7f7f054ce65b2cee1d64 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -9733,7 +9733,7 @@ inspector_keybinding_enabled (gboolean *warn)
   *warn = FALSE;
 
   schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default (),
-                                            "org.gtk.Settings.Debug",
+                                            "org.gtk.Settings.Debug4",
                                             TRUE);
 
   if (schema)
@@ -9755,7 +9755,7 @@ set_warn_again (gboolean warn)
   GSettings *settings;
 
   schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default (),
-                                            "org.gtk.Settings.Debug",
+                                            "org.gtk.Settings.Debug4",
                                             TRUE);
 
   if (schema)

diff --git a/gtk/meson.build b/gtk/meson.build
index 0acc01221741b58a600481f70e86750f8b8fd463..8fc6b91f0eb143a04e13dabeb2502bac3338dc4f 100644 (file)
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -970,7 +970,7 @@ gtk_settings_schemas = [
   'org.gtk.Settings.FileChooser.gschema.xml',
   'org.gtk.Settings.ColorChooser.gschema.xml',
   'org.gtk.Settings.EmojiChooser.gschema.xml',
-  'org.gtk.Settings.Debug.gschema.xml',
+  'org.gtk.Settings.Debug4.gschema.xml',
 ]
 install_data(gtk_settings_schemas, install_dir: gtk_schemasdir)
 gnome.compile_schemas(depend_files: files(gtk_settings_schemas),

diff --git a/gtk/org.gtk.Settings.Debug.gschema.xml b/gtk/org.gtk.Settings.Debug.gschema.xml
deleted file mode 100644 (file)
index ab24ec6..0000000
--- a/gtk/org.gtk.Settings.Debug.gschema.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
-
-  <schema id='org.gtk.Settings.Debug' path='/org/gtk/settings/debug/'>
-    <key name='enable-inspector-keybinding' type='b'>
-      <default>false</default>
-      <summary>Enable inspector keybinding</summary>
-      <description>
-        If this setting is true, GTK lets the user open an interactive
-        debugging window with a keybinding. The default shortcuts for
-        the keybinding are Control-Shift-I and Control-Shift-D.
-      </description>
-    </key>
-    <key name='inspector-warning' type='b'>
-      <default>true</default>
-      <summary>Inspector warning</summary>
-      <description>
-        If this setting is true, GTK shows a warning before letting
-        the user use the interactive debugger.
-      </description>
-    </key>
-  </schema>
-
-</schemalist>
-

diff --git a/gtk/org.gtk.Settings.Debug4.gschema.xml b/gtk/org.gtk.Settings.Debug4.gschema.xml
new file mode 100644 (file)
index 0000000..6b8b1c2
--- /dev/null
+++ b/gtk/org.gtk.Settings.Debug4.gschema.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+
+  <schema id='org.gtk.Settings.Debug4' path='/org/gtk/settings/debug4/'>
+    <key name='enable-inspector-keybinding' type='b'>
+      <default>false</default>
+      <summary>Enable inspector keybinding</summary>
+      <description>
+        If this setting is true, GTK lets the user open an interactive
+        debugging window with a keybinding. The default shortcuts for
+        the keybinding are Control-Shift-I and Control-Shift-D.
+      </description>
+    </key>
+    <key name='inspector-warning' type='b'>
+      <default>true</default>
+      <summary>Inspector warning</summary>
+      <description>
+        If this setting is true, GTK shows a warning before letting
+        the user use the interactive debugger.
+      </description>
+    </key>
+  </schema>
+
+</schemalist>
+